Move GtkSizeRequest into GtkWidget
authorBenjamin Otte <otte@redhat.com>
Tue, 21 Sep 2010 14:35:17 +0000 (16:35 +0200)
committerBenjamin Otte <otte@redhat.com>
Sun, 26 Sep 2010 13:11:45 +0000 (15:11 +0200)
commitd9c92598612714683eab96fecf6e90a9531607e5
tree4091fc22f94eeed203385670e1eb05d43b6f264c
parentf52a1fcfbde5c1b1108d4a03a9bf5c409b59a73e
Move GtkSizeRequest into GtkWidget

It doesn't make sense to keep them separate as GtkSizeRequest requires a
GtkWidget and GtkWidget implements GtkSizeRequest, so you can never have
one without the other.
It also makes the code a lot easier because no casts are required when
calling functions.

Also, the names would translate to gtk_widget_get_width() and people
agreed that this would be a too generic name, so a "preferred" was added
to the names.

So this patch moves the functions:
gtk_size_request_get_request_mode() => gtk_widget_get_request_mode()
gtk_size_request_get_width() => gtk_widget_get_preferred_width()
gtk_size_request_get_height() => gtk_widget_get_preferred_height()
gtk_size_request_get_size() => gtk_widget_get_preferred_size()
gtk_size_request_get_width_for_height() =>
  gtk_widget_get_preferred_width_for_height()
gtk_size_request_get_height_for_width() =>
  gtk_widget_get_preferred_height_for_width()
... and moves the corresponding vfuncs to the GtkWidgetClass.

The patch also renames the implementations of the vfuncs in widgets to
include the word "preferrred".
78 files changed:
demos/gtk-demo/offscreen_window.c
demos/gtk-demo/offscreen_window2.c
demos/testpixbuf-scale.c
docs/reference/gtk/gtk3-sections.txt
docs/reference/gtk/gtk3.types
docs/reference/gtk/tmpl/gtkcontainer.sgml
docs/reference/gtk/tmpl/gtkfilechooserbutton.sgml
gtk/gtk.symbols
gtk/gtkaccellabel.c
gtk/gtkalignment.c
gtk/gtkarrow.c
gtk/gtkaspectframe.c
gtk/gtkassistant.c
gtk/gtkbbox.c
gtk/gtkbin.c
gtk/gtkbox.c
gtk/gtkbutton.c
gtk/gtkcellrendereraccel.c
gtk/gtkcellrenderertext.c
gtk/gtkcellview.c
gtk/gtkcheckbutton.c
gtk/gtkcolorsel.c
gtk/gtkcombobox.c
gtk/gtkcontainer.c
gtk/gtkentry.c
gtk/gtkentrycompletion.c
gtk/gtkeventbox.c
gtk/gtkexpander.c
gtk/gtkfilechooserdefault.c
gtk/gtkfilechooserdialog.c
gtk/gtkfilechooserentry.c
gtk/gtkfixed.c
gtk/gtkfontsel.c
gtk/gtkframe.c
gtk/gtkhandlebox.c
gtk/gtkiconview.c
gtk/gtkimagemenuitem.c
gtk/gtklabel.c
gtk/gtklayout.c
gtk/gtklinkbutton.c
gtk/gtkmenu.c
gtk/gtkmenubar.c
gtk/gtkmenuitem.c
gtk/gtkmenutoolbutton.c
gtk/gtknotebook.c
gtk/gtkoffscreenwindow.c
gtk/gtkpaned.c
gtk/gtkpathbar.c
gtk/gtkprintoperation-win32.c
gtk/gtkprivate.h
gtk/gtkrecentchooserdefault.c
gtk/gtkscrolledwindow.c
gtk/gtksizegroup.c
gtk/gtksizerequest.c
gtk/gtksizerequest.h
gtk/gtksocket.c
gtk/gtkspinbutton.c
gtk/gtkspinner.c
gtk/gtkstatusicon.c
gtk/gtktable.c
gtk/gtktextlayout.c
gtk/gtktextview.c
gtk/gtktoolbar.c
gtk/gtktoolitem.c
gtk/gtktoolitemgroup.c
gtk/gtktoolpalette.c
gtk/gtktooltip.c
gtk/gtktreeview.c
gtk/gtkviewport.c
gtk/gtkwidget.c
gtk/gtkwidget.h
gtk/gtkwin32embedwidget.c
gtk/gtkwindow.c
gtk/gtkwrapbox.c
modules/input/gtkimcontextxim.c
tests/gtkoffscreenbox.c
tests/testellipsise.c
tests/testgtk.c